GH-3993: Fix async race condition in TcpOutGateway #3995
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes spring-projects#3993 When `TcpOutboundGateway` is in an `async` mode and `CCF` is configured not for `singleUse` an `Semaphore` around an obtained `TcpConnection` is involved. If we fail on `TcpConnection.send()`, resources are not clean up, including the mentioned `Semaphore`: in async mode this happens only when we receive a reply. * Catch an exception on the `TcpConnection.send()` and perform `cleanUp()` in async mode. * Add `cleanUp()` into a scheduled task from the `TcpOutboundGateway.AsyncReply` when no reply arrives in time. * Optimize `TcpOutboundGateway.AsyncReply` behavior to cancel no-reply scheduled task when reply arrives into a `CompletableFuture` **Cherry-pick to `5.5.x`**
garyrussell
suggested changes
Jan 23, 2023
| this.noResponseFuture = | ||
| getTaskScheduler() | ||
| .schedule(() -> { | ||
| cleanUp(this.haveSemaphore, this.connection, this.connection.getConnectionId()); |
There was a problem hiding this comment.
I think there's a new race here; we could end up releasing the semaphore twice because onMessage calls cleanup before completing the future.
Perhaps check if pendingReplies was actually removed in cleanup before releasing the semaphore?
There was a problem hiding this comment.
See some fixed I have pushed.
only if `future.completeExceptionally()` is `true`
garyrussell
approved these changes
Jan 23, 2023
|
Needs back port due to |
|
Forget that; since it's internal, we can use |
garyrussell
pushed a commit
that referenced
this pull request
Jan 23, 2023
* GH-3993: Fix async race condition in TcpOutGateway Fixes #3993 When `TcpOutboundGateway` is in an `async` mode and `CCF` is configured not for `singleUse` an `Semaphore` around an obtained `TcpConnection` is involved. If we fail on `TcpConnection.send()`, resources are not clean up, including the mentioned `Semaphore`: in async mode this happens only when we receive a reply. * Catch an exception on the `TcpConnection.send()` and perform `cleanUp()` in async mode. * Add `cleanUp()` into a scheduled task from the `TcpOutboundGateway.AsyncReply` when no reply arrives in time. * Optimize `TcpOutboundGateway.AsyncReply` behavior to cancel no-reply scheduled task when reply arrives into a `CompletableFuture` **Cherry-pick to `5.5.x`** * * Call `cleanUp()` from no response scheduled task only if `future.completeExceptionally()` is `true`
|
...and cherry-picked as 1aef041 after resolving conflicts. |
|
That's OK, Gary. So, your catch is good. I'll provide the fix in subsequent commit... |
|
Oops - compile error too. |
|
An adaptation to |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3993
When
TcpOutboundGatewayis in anasyncmode andCCFis configured not forsingleUseanSemaphorearound an obtainedTcpConnectionis involved. If we fail onTcpConnection.send(), resources are not clean up, including the mentionedSemaphore: in async mode this happens only when we receive a reply.TcpConnection.send()and performcleanUp()in async mode.cleanUp()into a scheduled task from theTcpOutboundGateway.AsyncReplywhen no reply arrives in time.TcpOutboundGateway.AsyncReplybehavior to cancel no-reply scheduled task when reply arrives into aCompletableFutureCherry-pick to
5.5.x